Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Wed, 5 Aug 2009 22:35:28 +0000 (00:35 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Wed, 5 Aug 2009 22:35:28 +0000 (00:35 +0200)
commitf6cc2149b3c73760f651caa9c0ea4b7c7c11ef6b
treeab73357a2339ba6780813811d28a17b573ea3d26
parentf450eb6d87570045cf4c261daad27dc9455af820
parent3c06ab6609a68a2e7966f74c7f0acae654b11238
Merge branch 'upstream'